From 30a7264865ae5f97771dd895068446157a1535e9 Mon Sep 17 00:00:00 2001 From: Lapo Calamandrei Date: Fri, 11 Aug 2017 15:07:13 +0200 Subject: [PATCH] adwaita: Remove menu margins menu margins have been added has a hack to mitigate bug: https://bugzilla.gnome.org/show_bug.cgi?id=591258 with gtk+4 this doesn't work anymore on gtk+4, the margin should probably be moved to the parent window node, but it's not selectable, commenting out for now. --- gtk/theme/Adwaita/_common.scss | 2 +- gtk/theme/Adwaita/gtk-contained-dark.css | 2 +- gtk/theme/Adwaita/gtk-contained.css | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss index 539d2522f4..8fde72af8e 100644 --- a/gtk/theme/Adwaita/_common.scss +++ b/gtk/theme/Adwaita/_common.scss @@ -1922,7 +1922,7 @@ menubar, menu, .menu, .context-menu { - margin: 4px; // See https://bugzilla.gnome.org/show_bug.cgi?id=591258 + // this is not a good solution, commenting out for now margin: 4px; // See https://bugzilla.gnome.org/show_bug.cgi?id=591258 padding: 2px 0px; background-color: $menu_color; border: 1px solid $borders_color; // adds borders in a non composited env diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css index c3514bd3ea..e5b7343412 100644 --- a/gtk/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/theme/Adwaita/gtk-contained-dark.css @@ -773,7 +773,7 @@ menubar > menuitem:hover, .menubar > menuitem:hover { box-shadow: inset 0 -3px # menubar > menuitem:disabled, .menubar > menuitem:disabled { color: #919494; box-shadow: none; } -menu, .menu, .context-menu { margin: 4px; padding: 2px 0px; background-color: #262b2d; border: 1px solid #1b1f20; } +menu, .menu, .context-menu { padding: 2px 0px; background-color: #262b2d; border: 1px solid #1b1f20; } .csd menu, .csd .menu, .csd .context-menu { border: none; } diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css index f1973c0f0b..5257e79082 100644 --- a/gtk/theme/Adwaita/gtk-contained.css +++ b/gtk/theme/Adwaita/gtk-contained.css @@ -781,7 +781,7 @@ menubar > menuitem:hover, .menubar > menuitem:hover { box-shadow: inset 0 -3px # menubar > menuitem:disabled, .menubar > menuitem:disabled { color: #8b8e8f; box-shadow: none; } -menu, .menu, .context-menu { margin: 4px; padding: 2px 0px; background-color: #ffffff; border: 1px solid #b6b6b3; } +menu, .menu, .context-menu { padding: 2px 0px; background-color: #ffffff; border: 1px solid #b6b6b3; } .csd menu, .csd .menu, .csd .context-menu { border: none; } -- 2.30.2